auto merge of #1079 : alexcrichton/cargo/update-rust, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 21 Dec 2014 20:43:45 +0000 (20:43 +0000)
committerbors <bors@rust-lang.org>
Sun, 21 Dec 2014 20:43:45 +0000 (20:43 +0000)
commite11c3172bcdc895e395b6eef4eaa638f0f0c1915
tree26f9d1f6d7b78bc4153fc8b15f77efef83900e92
parent17d242b005c20acb859a31398479b713d92df037
parent48420965e6c520fae50a104dcf81ea518b8c9803
auto merge of #1079 : alexcrichton/cargo/update-rust, r=alexcrichton

Continuation of #1077
Closes https://github.com/rust-lang/cargo/pull/1079